merge
authorvhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>
Tue, 3 Jan 2006 13:04:59 +0000 (13:04 +0000)
committervhanquez@kneesa.uk.xensource.com <vhanquez@kneesa.uk.xensource.com>
Tue, 3 Jan 2006 13:04:59 +0000 (13:04 +0000)

Trivial merge